<!DOCTYPE html>
<html lang="zh-CN">
<head>
  <meta charset="UTF-8">
<meta name="viewport" content="width=device-width">
<meta name="theme-color" content="#222"><meta name="generator" content="Hexo 7.3.0">

  <link rel="apple-touch-icon" sizes="180x180" href="/images/apple-touch-icon-next.png">
  <link rel="icon" type="image/png" sizes="32x32" href="/images/favicon-32x32.ico">
  <link rel="icon" type="image/png" sizes="16x16" href="/images/favicon-16x16.ico">
  <link rel="mask-icon" href="/images/logo.svg" color="#222">

<link rel="stylesheet" href="/css/main.css">



<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" integrity="sha256-wiz7ZSCn/btzhjKDQBms9Hx4sSeUYsDrTLg7roPstac=" crossorigin="anonymous">
  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.1.1/animate.min.css" integrity="sha256-PR7ttpcvz8qrF57fur/yAx1qXMFJeJFiA6pSzWi0OIE=" crossorigin="anonymous">
  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fancyapps-ui/5.0.28/fancybox/fancybox.css" integrity="sha256-6cQIC71/iBIYXFK+0RHAvwmjwWzkWd+r7v/BX3/vZDc=" crossorigin="anonymous">
  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/pace/1.2.4/themes/green/pace-theme-minimal.css">
  <script src="https://cdnjs.cloudflare.com/ajax/libs/pace/1.2.4/pace.min.js" integrity="sha256-gqd7YTjg/BtfqWSwsJOvndl0Bxc8gFImLEkXQT8+qj0=" crossorigin="anonymous"></script>

<script class="next-config" data-name="main" type="application/json">{"hostname":"sumumm.github.io","root":"/","images":"/images","scheme":"Gemini","darkmode":false,"version":"8.19.2","exturl":false,"sidebar":{"position":"left","display":"post","padding":18,"offset":12},"copycode":{"enable":true,"style":"mac"},"fold":{"enable":true,"height":300},"bookmark":{"enable":false,"color":"#222","save":"auto"},"mediumzoom":false,"lazyload":true,"pangu":false,"comments":{"style":"tabs","active":null,"storage":true,"lazyload":false,"nav":null},"stickytabs":false,"motion":{"enable":true,"async":true,"transition":{"menu_item":"fadeInDown","post_block":"fadeIn","post_header":"fadeInDown","post_body":"fadeInDown","coll_header":"fadeInLeft","sidebar":"fadeInUp"}},"i18n":{"placeholder":"搜索...","empty":"没有找到任何搜索结果：${query}","hits_time":"找到 ${hits} 个搜索结果（用时 ${time} 毫秒）","hits":"找到 ${hits} 个搜索结果"},"path":"/search.xml","localsearch":{"enable":true,"trigger":"auto","top_n_per_article":1,"unescape":false,"preload":false}}</script><script src="/js/config.js"></script>

    <meta name="description" content="本文主要是Git中撤销与数据恢复的相关笔记，若笔记中有错误或者不合适的地方，欢迎批评指正😃。">
<meta property="og:type" content="article">
<meta property="og:title" content="LV01-Git-04-Git本地仓库-04-撤销与版本回退">
<meta property="og:url" content="https://sumumm.github.io/post/b3401885.html">
<meta property="og:site_name" content="苏木">
<meta property="og:description" content="本文主要是Git中撤销与数据恢复的相关笔记，若笔记中有错误或者不合适的地方，欢迎批评指正😃。">
<meta property="og:locale" content="zh_CN">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622182414553.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622201302462.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622201515487.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622201634100.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622201731087.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622202532011.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622203353223.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622204320520.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622204454677.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622205233019.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622211911237.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622212625172.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622212732221.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622212625172.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622213658491.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622213752920.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622214138386.png">
<meta property="og:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622214405045.png">
<meta property="article:published_time" content="2023-07-02T07:14:21.000Z">
<meta property="article:modified_time" content="2025-06-13T16:25:57.069Z">
<meta property="article:author" content="苏木">
<meta property="article:tag" content="Git">
<meta name="twitter:card" content="summary">
<meta name="twitter:image" content="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622182414553.png">


<link rel="canonical" href="https://sumumm.github.io/post/b3401885.html">



<script class="next-config" data-name="page" type="application/json">{"sidebar":"","isHome":false,"isPost":true,"lang":"zh-CN","comments":true,"permalink":"https://sumumm.github.io/post/b3401885.html","path":"post/b3401885.html","title":"LV01-Git-04-Git本地仓库-04-撤销与版本回退"}</script>

<script class="next-config" data-name="calendar" type="application/json">""</script>
<title>LV01-Git-04-Git本地仓库-04-撤销与版本回退 | 苏木</title>
  








    <script src="/js/browser_tools_disable.js"></script>

  <noscript>
    <link rel="stylesheet" href="/css/noscript.css">
  </noscript>
<!-- hexo injector head_end start --><link rel="stylesheet" href="https://unpkg.com/hexo-next-tags-plus@latest/lib/tag_plus.css" media="defer" onload="this.media='all'"><!-- hexo injector head_end end --></head>

<body itemscope itemtype="http://schema.org/WebPage" class="use-motion">
  <div class="headband"></div>

  <main class="main">
    <div class="column">
      <header class="header" itemscope itemtype="http://schema.org/WPHeader"><div class="site-brand-container">
  <div class="site-nav-toggle">
    <div class="toggle" aria-label="切换导航栏" role="button">
        <span class="toggle-line"></span>
        <span class="toggle-line"></span>
        <span class="toggle-line"></span>
    </div>
  </div>

  <div class="site-meta">

    <a href="/" class="brand" rel="start">
      <i class="logo-line"></i>
      <p class="site-title">苏木</p>
      <i class="logo-line"></i>
    </a>
      <p class="site-subtitle" itemprop="description">我的学习之路</p>
  </div>

  <div class="site-nav-right">
    <div class="toggle popup-trigger" aria-label="搜索" role="button">
        <i class="fa fa-search fa-fw fa-lg"></i>
    </div>
  </div>
</div>



<nav class="site-nav">
  <ul class="main-menu menu"><li class="menu-item menu-item-home"><a href="/" rel="section"><i class="fa fa-home fa-fw"></i>苏木的家</a></li><li class="menu-item menu-item-categories"><a href="/categories/" rel="section"><i class="fa fa-th fa-fw"></i>分类页<span class="badge">42</span></a></li><li class="menu-item menu-item-archives"><a href="/archives/" rel="section"><i class="fa fa-archive fa-fw"></i>归档页<span class="badge">673</span></a></li><li class="menu-item menu-item-flink"><a href="/flink/" rel="section"><i class="fa fa-link fa-fw"></i>友人帐</a></li><li class="menu-item menu-item-about"><a href="/about/" rel="section"><i class="fa fa-user fa-fw"></i>关于我</a></li>
      <li class="menu-item menu-item-search">
        <a role="button" class="popup-trigger"><i class="fa fa-search fa-fw"></i>搜索
        </a>
      </li>
  </ul>
</nav>



  <div class="search-pop-overlay">
    <div class="popup search-popup"><div class="search-header">
  <span class="search-icon">
    <i class="fa fa-search"></i>
  </span>
  <div class="search-input-container">
    <input autocomplete="off" autocapitalize="off" maxlength="80"
           placeholder="搜索..." spellcheck="false"
           type="search" class="search-input">
  </div>
  <span class="popup-btn-close" role="button">
    <i class="fa fa-times-circle"></i>
  </span>
</div>
<div class="search-result-container no-result">
  <div class="search-result-icon">
    <i class="fa fa-spinner fa-pulse fa-5x"></i>
  </div>
</div>

    </div>
  </div>

</header>
        
  
  <aside class="sidebar">

    <div class="sidebar-inner sidebar-nav-active sidebar-toc-active">
      <ul class="sidebar-nav">
        <li class="sidebar-nav-toc">
          文章目录
        </li>
        <li class="sidebar-nav-overview">
          站点概览
        </li>
      </ul>

      <div class="sidebar-panel-container">
        <!--noindex-->
        <div class="post-toc-wrap sidebar-panel">
            <div class="post-toc animated"><ol class="nav"><li class="nav-item nav-level-1"><a class="nav-link" href="#%E4%B8%80%E3%80%81%E6%96%87%E4%BB%B6%E5%87%86%E5%A4%87"><span class="nav-text">一、文件准备</span></a></li><li class="nav-item nav-level-1"><a class="nav-link" href="#%E4%BA%8C%E3%80%81%E6%92%A4%E9%94%80%E6%93%8D%E4%BD%9C"><span class="nav-text">二、撤销操作</span></a><ol class="nav-child"><li class="nav-item nav-level-2"><a class="nav-link" href="#1-%E4%BF%AE%E6%94%B9%E4%B8%8A%E6%AC%A1%E6%8F%90%E4%BA%A4"><span class="nav-text">1. 修改上次提交</span></a><ol class="nav-child"><li class="nav-item nav-level-3"><a class="nav-link" href="#1-1-%E6%83%85%E5%86%B5%E8%AF%B4%E6%98%8E"><span class="nav-text">1.1 情况说明</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#1-2-%E5%91%BD%E4%BB%A4%E8%AF%B4%E6%98%8E"><span class="nav-text">1.2 命令说明</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#1-3-%E4%BD%BF%E7%94%A8%E5%AE%9E%E4%BE%8B"><span class="nav-text">1.3 使用实例</span></a><ol class="nav-child"><li class="nav-item nav-level-4"><a class="nav-link" href="#1-3-1-%E6%9F%A5%E7%9C%8B%E6%96%87%E4%BB%B6%E7%8A%B6%E6%80%81"><span class="nav-text">1.3.1 查看文件状态</span></a></li><li class="nav-item nav-level-4"><a class="nav-link" href="#1-3-2-%E9%87%8D%E6%96%B0%E6%8F%90%E4%BA%A4"><span class="nav-text">1.3.2 重新提交</span></a></li><li class="nav-item nav-level-4"><a class="nav-link" href="#1-3-3-%E6%8F%90%E4%BA%A4%E8%AE%B0%E5%BD%95"><span class="nav-text">1.3.3 提交记录</span></a></li></ol></li></ol></li><li class="nav-item nav-level-2"><a class="nav-link" href="#2-%E6%92%A4%E9%94%80%E5%AF%B9%E6%96%87%E4%BB%B6%E7%9A%84%E4%BF%AE%E6%94%B9"><span class="nav-text">2. 撤销对文件的修改</span></a><ol class="nav-child"><li class="nav-item nav-level-3"><a class="nav-link" href="#2-1-%E6%83%85%E5%86%B5%E8%AF%B4%E6%98%8E"><span class="nav-text">2.1 情况说明</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#2-2-git-status%E7%9A%84%E6%8F%90%E7%A4%BA"><span class="nav-text">2.2 git status的提示</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#2-3-%E6%92%A4%E9%94%80%E5%91%BD%E4%BB%A4"><span class="nav-text">2.3 撤销命令</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#2-4-%E4%BD%BF%E7%94%A8%E5%AE%9E%E4%BE%8B"><span class="nav-text">2.4 使用实例</span></a></li></ol></li><li class="nav-item nav-level-2"><a class="nav-link" href="#3-%E5%8F%96%E6%B6%88%E6%9A%82%E5%AD%98%E7%9A%84%E6%96%87%E4%BB%B6"><span class="nav-text">3. 取消暂存的文件</span></a><ol class="nav-child"><li class="nav-item nav-level-3"><a class="nav-link" href="#3-1-%E6%83%85%E5%86%B5%E8%AF%B4%E6%98%8E"><span class="nav-text">3.1 情况说明</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#3-2-git-status%E7%9A%84%E6%8F%90%E7%A4%BA"><span class="nav-text">3.2 git status的提示</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#3-3-%E6%92%A4%E9%94%80%E5%91%BD%E4%BB%A4"><span class="nav-text">3.3 撤销命令</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#3-4-%E4%BD%BF%E7%94%A8%E5%AE%9E%E4%BE%8B"><span class="nav-text">3.4 使用实例</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#3-5-%E6%8F%90%E4%BA%A4%E6%9B%B4%E6%96%B0"><span class="nav-text">3.5 提交更新</span></a></li></ol></li></ol></li><li class="nav-item nav-level-1"><a class="nav-link" href="#%E4%B8%89%E3%80%81%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80"><span class="nav-text">三、版本回退</span></a><ol class="nav-child"><li class="nav-item nav-level-2"><a class="nav-link" href="#1-%E6%83%85%E5%86%B5%E8%AF%B4%E6%98%8E"><span class="nav-text">1. 情况说明</span></a></li><li class="nav-item nav-level-2"><a class="nav-link" href="#2-%E8%B7%B3%E5%88%B0%E6%8C%87%E5%AE%9A%E7%89%88%E6%9C%AC"><span class="nav-text">2. 跳到指定版本</span></a></li><li class="nav-item nav-level-2"><a class="nav-link" href="#3-%E6%9F%A5%E7%9C%8B%E6%8F%90%E4%BA%A4%E8%AE%B0%E5%BD%95hash%E5%80%BC"><span class="nav-text">3. 查看提交记录hash值</span></a></li><li class="nav-item nav-level-2"><a class="nav-link" href="#4-%E4%BD%BF%E7%94%A8%E5%AE%9E%E4%BE%8B"><span class="nav-text">4. 使用实例</span></a><ol class="nav-child"><li class="nav-item nav-level-3"><a class="nav-link" href="#4-1-%E6%9F%A5%E7%9C%8B%E6%8F%90%E4%BA%A4%E8%AE%B0%E5%BD%95"><span class="nav-text">4.1 查看提交记录</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#4-2-%E8%B7%B3%E8%BD%AC%E6%8C%87%E5%AE%9A%E7%89%88%E6%9C%AC"><span class="nav-text">4.2 跳转指定版本</span></a></li></ol></li><li class="nav-item nav-level-2"><a class="nav-link" href="#5-git-reflog%E7%9A%84%E5%BA%94%E7%94%A8"><span class="nav-text">5. git reflog的应用</span></a><ol class="nav-child"><li class="nav-item nav-level-3"><a class="nav-link" href="#5-1-%E6%83%85%E5%86%B5%E8%AF%B4%E6%98%8E"><span class="nav-text">5.1 情况说明</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#5-2-%E6%9F%A5%E7%9C%8B%E6%89%80%E6%9C%89%E6%8F%90%E4%BA%A4%E8%AE%B0%E5%BD%95"><span class="nav-text">5.2 查看所有提交记录</span></a></li><li class="nav-item nav-level-3"><a class="nav-link" href="#5-3-%E8%B7%B3%E8%BD%AC%E5%88%B0%E6%8C%87%E5%AE%9A%E7%89%88%E6%9C%AC"><span class="nav-text">5.3 跳转到指定版本</span></a></li></ol></li></ol></li></ol></div>
        </div>
        <!--/noindex-->

        <div class="site-overview-wrap sidebar-panel">
          <div class="site-author animated" itemprop="author" itemscope itemtype="http://schema.org/Person">
    <img class="site-author-image" itemprop="image" alt="苏木"
      src="/images/avatar.jpg">
  <p class="site-author-name" itemprop="name">苏木</p>
  <div class="site-description" itemprop="description">莫道桑榆晚，为霞尚满天</div>
</div>
<div class="site-state-wrap animated">
  <nav class="site-state">
      <div class="site-state-item site-state-posts">
        <a href="/archives/">
          <span class="site-state-item-count">673</span>
          <span class="site-state-item-name">日志</span>
        </a>
      </div>
      <div class="site-state-item site-state-categories">
          <a href="/categories/">
        <span class="site-state-item-count">42</span>
        <span class="site-state-item-name">分类</span></a>
      </div>
      <div class="site-state-item site-state-tags">
        <span class="site-state-item-count">43</span>
        <span class="site-state-item-name">标签</span>
      </div>
  </nav>
</div>
  <div class="links-of-author animated">
      <span class="links-of-author-item">
        <a href="https://github.com/sumumm" title="GitHub → https:&#x2F;&#x2F;github.com&#x2F;sumumm" rel="noopener me" target="_blank"><i class="fab fa-github fa-fw"></i>GitHub</a>
      </span>
  </div>

        </div>
      </div>
    </div>

    
  </aside>


    </div>

    <div class="main-inner post posts-expand">


  


<div class="post-block">
  
  

  <article itemscope itemtype="http://schema.org/Article" class="post-content" lang="zh-CN">
    <link itemprop="mainEntityOfPage" href="https://sumumm.github.io/post/b3401885.html">

    <span hidden itemprop="author" itemscope itemtype="http://schema.org/Person">
      <meta itemprop="image" content="/images/avatar.jpg">
      <meta itemprop="name" content="苏木">
    </span>

    <span hidden itemprop="publisher" itemscope itemtype="http://schema.org/Organization">
      <meta itemprop="name" content="苏木">
      <meta itemprop="description" content="莫道桑榆晚，为霞尚满天">
    </span>

    <span hidden itemprop="post" itemscope itemtype="http://schema.org/CreativeWork">
      <meta itemprop="name" content="LV01-Git-04-Git本地仓库-04-撤销与版本回退 | 苏木">
      <meta itemprop="description" content="">
    </span>
      <header class="post-header">
        <h1 class="post-title" itemprop="name headline">
          LV01-Git-04-Git本地仓库-04-撤销与版本回退
        </h1>

        <div class="post-meta-container">
          <div class="post-meta">
    <span class="post-meta-item">
      <span class="post-meta-item-icon">
        <i class="far fa-calendar"></i>
      </span>
      <span class="post-meta-item-text">发表于</span>

      <time title="创建时间：2023-07-02 15:14:21" itemprop="dateCreated datePublished" datetime="2023-07-02T15:14:21+08:00">2023-07-02</time>
    </span>
    <span class="post-meta-item">
      <span class="post-meta-item-icon">
        <i class="far fa-folder"></i>
      </span>
      <span class="post-meta-item-text">分类于</span>
        <span itemprop="about" itemscope itemtype="http://schema.org/Thing">
          <a href="/categories/%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/" itemprop="url" rel="index"><span itemprop="name">开发工具</span></a>
        </span>
          ，
        <span itemprop="about" itemscope itemtype="http://schema.org/Thing">
          <a href="/categories/%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/" itemprop="url" rel="index"><span itemprop="name">03版本控制</span></a>
        </span>
    </span>

  
    <span class="post-meta-break"></span>
    <span class="post-meta-item" title="本文字数">
      <span class="post-meta-item-icon">
        <i class="far fa-file-word"></i>
      </span>
      <span class="post-meta-item-text">本文字数：</span>
      <span>4.9k</span>
    </span>
    <span class="post-meta-item" title="阅读时长">
      <span class="post-meta-item-icon">
        <i class="far fa-clock"></i>
      </span>
      <span class="post-meta-item-text">阅读时长 &asymp;</span>
      <span>18 分钟</span>
    </span>
</div>

        </div>
      </header>

    
    
    
    <div class="post-body" itemprop="articleBody"><p>本文主要是Git中撤销与数据恢复的相关笔记，若笔记中有错误或者不合适的地方，欢迎批评指正😃。</p>
<span id="more"></span>

<!-- Photo: https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/ -->

<details class="folding-tag" blue><summary> 点击查看使用工具及版本 </summary>
              <div class='content'>
              <table>    <tr>        <td align="center" width=150px>Windows</td>        <td align="left">windows11</td>    </tr>    <tr>        <td align="center">Ubuntu</td>        <td align="left">Ubuntu16.04的64位版本</td>      </tr>    <tr>        <td align="center">VMware® Workstation 16 Pro</td>        <td align="left">16.2.3 build-19376536</td>      </tr></table>
              </div>
            </details>

<details class="folding-tag" blue><summary> 点击查看本文参考资料 </summary>
              <div class='content'>
              <table>    <tr><td align="center">参考方向  </td><td align="center">参考原文</td></tr>    <tr><td align="left">Git 官网</td><td align="left"><a href="https://git-scm.com/" target="_blank">https://git-scm.com/ <i class="fa fa-external-link-alt"></i> </a></td></tr>    <tr><td align="left">Git 官方文档</td><td align="left"><a href="https://git-scm.com/doc" target="_blank">https://git-scm.com/doc <i class="fa fa-external-link-alt"></i> </a></td></tr>    <tr><td align="left">Pro Git Book</td><td align="left"><a href="https://git-scm.com/book/zh/v2" target="_blank">https://git-scm.com/book/zh/v2 <i class="fa fa-external-link-alt"></i> </a></td></tr>    <tr><td align="left">Git 快速使用指南</td><td align="left"><a href="https://training.github.com/downloads/zh_CN/github-git-cheat-sheet/" target="_blank">https://training.github.com/downloads/zh_CN/github-git-cheat-sheet/ <i class="fa fa-external-link-alt"></i> </a></td></tr>    <tr><td align="left">Visual Git Cheat Sheet</td><td align="left"><a href="https://ndpsoftware.com/git-cheatsheet.html#loc=index" target="_blank">https://ndpsoftware.com/git-cheatsheet.html#loc=index <i class="fa fa-external-link-alt"></i> </a></td></tr></table>
              </div>
            </details>

<details class="folding-tag" blue><summary> 点击查看相关文件下载 </summary>
              <div class='content'>
              <table>    <tr>        <td align="center">---</td>        <td align="left">--- <a href="" target="_blank">  <i class="fa fa-external-link-alt"></i></a></td>      </tr></table>
              </div>
            </details>

<p>【说明】本节笔记的相关操作在Windows下进行，因为VS Code有个Git的插件，可以很直观的演示一些东西。由于Git安装后自带一个Git-Bash终端，所以就不用Win下的命令行啦，就用的这个终端，因为它里边的命令与Linux很类似，而windows中的命令行有些命令与linux并不相同，为了统一，还是用用Git自带的终端啦。另外VS Code是可以选择使用的终端的，我直接将VS Code使用的终端改成了git-bash，这样更方便一些。</p>
<h1 id="一、文件准备"><a href="#一、文件准备" class="headerlink" title="一、文件准备"></a><font size=3>一、文件准备</font></h1><p>我们这里重新准备一个版本库用于这一节笔记的使用：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br><span class="line">3</span><br><span class="line">4</span><br></pre></td><td class="code"><pre><span class="line">git init</span><br><span class="line">touch readme.md</span><br><span class="line">git add .</span><br><span class="line">git commit -m &quot;feat:创建本地版本库并进行第一次提交(readme文件为空)&quot;</span><br></pre></td></tr></table></figure>

<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622182414553.png" alt="image-20230622182414553" style="zoom: 43%;" />

<h1 id="二、撤销操作"><a href="#二、撤销操作" class="headerlink" title="二、撤销操作"></a><font size=3>二、撤销操作</font></h1><h2 id="1-修改上次提交"><a href="#1-修改上次提交" class="headerlink" title="1. 修改上次提交"></a><font size=3>1. 修改上次提交</font></h2><h3 id="1-1-情况说明"><a href="#1-1-情况说明" class="headerlink" title="1.1 情况说明"></a><font size=3>1.1 情况说明</font></h3><p>我们上边创建了一个空的readme.md文件，并且提交了，但是，现在我们希望创建一个test.c文件，并且将test.c这个文件的功能写入到readme文件中。</p>
<p>一般来讲，我们可以重新提交一次，但是这就意味着版本库中有两个提交记录，但是其实根本没必要有两个提交记录啊，readme文件本来就是记录一些说明信息的，那么现在我们<strong>既想将新文件提交上去，又不想产生两次提交记录</strong>，那么要怎么样解决呢？</p>
<h3 id="1-2-命令说明"><a href="#1-2-命令说明" class="headerlink" title="1.2 命令说明"></a><font size=3>1.2 命令说明</font></h3><p>此时，为了解决上边的问题，我们可以运行带有 <code>–amend</code> 选项的提交命令来重新提交，这样可以避免让仓库历史纪录变得复杂，一般格式如下：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br></pre></td><td class="code"><pre><span class="line">git commit --amend -m &quot;新的描述&quot;  # 如果不加-m参数，系统会让进行输入的</span><br><span class="line">git commit --amend  --no-edit    # 不修改描述，只是添加新文件</span><br></pre></td></tr></table></figure>

<p>这个命令会将暂存区中的文件提交。 如果自上次提交以来我们还未做任何修改（例如，在上次提交后马上执行了此命令）， 那么快照会保持不变，而我们所修改的只是提交信息。</p>
<p>当我们在修补最后的提交时，与其说是修复旧提交，倒不如说是完全用一个 <strong>新的提交</strong> 替换旧的提交。从效果上来说，就像是旧有的提交从未存在过一样，它并不会出现在仓库的历史中。</p>
<p>修补提交最明显的价值是可以稍微改进我们最后的提交，而不会让“啊，忘了添加一个文件”或者 “小修补，修正笔误”这种提交信息弄乱我们的仓库历史。</p>
<h3 id="1-3-使用实例"><a href="#1-3-使用实例" class="headerlink" title="1.3 使用实例"></a><font size=3>1.3 使用实例</font></h3><h4 id="1-3-1-查看文件状态"><a href="#1-3-1-查看文件状态" class="headerlink" title="1.3.1 查看文件状态"></a><font size=3>1.3.1 查看文件状态</font></h4><p>我们需要创建一个test.c文件，然后再修改readme文件，完成后，文件状态如下：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622201302462.png" alt="image-20230622201302462" style="zoom:67%;" />

<h4 id="1-3-2-重新提交"><a href="#1-3-2-重新提交" class="headerlink" title="1.3.2 重新提交"></a><font size=3>1.3.2 重新提交</font></h4><p>我们重新提交这一次的修改：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br></pre></td><td class="code"><pre><span class="line">git add .</span><br><span class="line">git commit --amend # 重新提交</span><br></pre></td></tr></table></figure>

<p>然后，Git就会打开默认的编辑器，可以看到之前的提交信息，我们编辑后保存会覆盖原来的提交信息。</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622201515487.png" alt="image-20230622201515487" style="zoom:67%;" />

<p>提交后如下图所示：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622201634100.png" alt="image-20230622201634100" style="zoom:67%;" />

<h4 id="1-3-3-提交记录"><a href="#1-3-3-提交记录" class="headerlink" title="1.3.3 提交记录"></a><font size=3>1.3.3 提交记录</font></h4><p>我们使用自定义的git命令查看一下提交记录：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622201731087.png" alt="image-20230622201731087" style="zoom:50%;" />

<p>会发现，整个仓库就只有这一条提交记录。也就是我们第二次提交的结果代替了第一次提交，就相当于第一次提交没有存在一样。</p>
<h2 id="2-撤销对文件的修改"><a href="#2-撤销对文件的修改" class="headerlink" title="2. 撤销对文件的修改"></a><font size=3>2. 撤销对文件的修改</font></h2><p>这部分说的文件修改还暂未提交到暂存库，也就是修改文件之后，<code>git add</code>之前的状态。</p>
<h3 id="2-1-情况说明"><a href="#2-1-情况说明" class="headerlink" title="2.1 情况说明"></a><font size=3>2.1 情况说明</font></h3><p>我们现在对test.c做一系列的修改，这个时候我们并未但是改完之后，这些修改我不想要了，我并不想保留对这个文件的修改，这个时候怎么办，一行一行吧修改的地方删掉吗？是个办法，对于我们测试文件来说，比较简单，倒无所谓，可是当我们在大型项目中开发，修改了大量的文件的时候，也不想保留修改这该怎么办？也一个一个改嘛，这显然是不现实的。 </p>
<p>那么我们该如何方便地撤消修改——将它还原成上次提交时的样子（或者刚克隆完的样子，或者刚把它放入工作目录时的样子）？ 幸运的是，<code>git status</code> 也告诉了我们应该如何做。 </p>
<h3 id="2-2-git-status的提示"><a href="#2-2-git-status的提示" class="headerlink" title="2.2 git status的提示"></a><font size=3>2.2 git status的提示</font></h3><p>我们来修改一下test.c文件，然后看一下<code>git status</code>命令有什么提示：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622202532011.png" alt="image-20230622202532011" style="zoom:50%;" />

<p>可以看到，有这么一句话：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">(use &quot;git restore &lt;file&gt;...&quot; to discard changes in working directory)</span><br></pre></td></tr></table></figure>

<p>这个命令其实就可以用于撤销我们对于文件的修改。</p>
<h3 id="2-3-撤销命令"><a href="#2-3-撤销命令" class="headerlink" title="2.3 撤销命令"></a><font size=3>2.3 撤销命令</font></h3><p>其实可以达到撤销未暂存的文件的修改的命令不仅仅上边这一个，还有一个checkout，具体为什么<code>git status</code>命令没有给出提示，还不清楚，不过不重要，我们知道就可以了：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br></pre></td><td class="code"><pre><span class="line">git checkout -- &lt;file&gt;...</span><br><span class="line">git restore &lt;file&gt;...</span><br></pre></td></tr></table></figure>

<p>&lt;file&gt;…可以是多个文件，当然要是我们向直接撤销所有文件的修改，那么可以直接用下边的两个命令：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br></pre></td><td class="code"><pre><span class="line">git checkout -- .</span><br><span class="line">git restore .</span><br></pre></td></tr></table></figure>

<p>需要特别注意，这两个命令是很<strong>危险的命令</strong>。 我们对那个文件在本地的<strong>任何修改都会消失</strong>——Git 会用最近提交的版本覆盖掉它。 除非我们确实清楚不想要对那个文件的本地修改了，否则最好不要使用这个命令。</p>
<h3 id="2-4-使用实例"><a href="#2-4-使用实例" class="headerlink" title="2.4 使用实例"></a><font size=3>2.4 使用实例</font></h3><p>我们用<code>git checkout</code>来试一下吧：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git checkout -- test.c</span><br></pre></td></tr></table></figure>

<p>然后我们会看到如下信息：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622203353223.png" alt="image-20230622203353223" style="zoom:67%;" />

<p>如果我们仍然想保留对那个文件做出的修改，但是现在仍然需要撤消，我们将会在 <a target="_blank" rel="noopener" href="https://git-scm.com/book/zh/v2/ch00/ch03-git-branching">Git 分支</a> 介绍保存进度与分支，这通常是更好的做法。在 Git 中任何 <strong>已提交</strong> 的东西几乎总是可以恢复的。 甚至那些被删除的分支中的提交或使用 <code>--amend</code> 选项覆盖的提交也可以恢复 （阅读 <a target="_blank" rel="noopener" href="https://git-scm.com/book/zh/v2/ch00/_data_recovery">数据恢复</a> 了解数据恢复）。 然而，任何我们未提交的东西丢失后很可能再也找不到了。</p>
<h2 id="3-取消暂存的文件"><a href="#3-取消暂存的文件" class="headerlink" title="3. 取消暂存的文件"></a><font size=3>3. 取消暂存的文件</font></h2><p>这一部分是针对我们修改了文件，并且已经通过<code>git add</code>添加到暂存区的文件。</p>
<h3 id="3-1-情况说明"><a href="#3-1-情况说明" class="headerlink" title="3.1 情况说明"></a><font size=3>3.1 情况说明</font></h3><p>现在有这样的情况，我们已经修改了两个文件并且想要将它们作为两次独立的修改提交， 但是却意外地输入 <code>git add *</code>或者<code>git add .</code> 暂存了它们两个。但是这两个文件我想作为两次提交，有两个提交记录便于追溯，那么如何只取消暂存两个中的一个呢？ </p>
<h3 id="3-2-git-status的提示"><a href="#3-2-git-status的提示" class="headerlink" title="3.2 git status的提示"></a><font size=3>3.2 git status的提示</font></h3><p>我们来修改一下test.c和readme文件，然后看一下<code>git status</code>命令有什么提示：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622204320520.png" alt="image-20230622204320520" style="zoom:50%;" />

<p>修改完毕后，我们将修改提交到暂存区，然后查看一下文件状态：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br></pre></td><td class="code"><pre><span class="line">git add .</span><br><span class="line">git status</span><br></pre></td></tr></table></figure>

<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622204454677.png" alt="image-20230622204454677" style="zoom:67%;" />

<p>可以看到，有这么一句话：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">(use &quot;git restore --staged &lt;file&gt;...&quot; to unstage)</span><br></pre></td></tr></table></figure>

<p>这个命令其实就可以用于撤销我们对于文件的修改。</p>
<h3 id="3-3-撤销命令"><a href="#3-3-撤销命令" class="headerlink" title="3.3 撤销命令"></a><font size=3>3.3 撤销命令</font></h3><p>其实撤销提交到暂存区的修改为命令一共有两个，但是git提示只给出了一个：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br></pre></td><td class="code"><pre><span class="line">git restore --staged &lt;file&gt;...</span><br><span class="line">git reset HEAD &lt;file&gt;...</span><br></pre></td></tr></table></figure>

<p>&lt;file&gt;…可以是多个文件，当然要是我们向直接撤销所有文件的修改，那么可以直接用下边的两个命令：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br></pre></td><td class="code"><pre><span class="line">git restore --staged .</span><br><span class="line">git reset HEAD .</span><br></pre></td></tr></table></figure>

<p>这两个命令没有想象中那么危险，我们取消暂存区的修改后，这些修改还保留在工作区，只是回到了我们刚修改完文件的状态。</p>
<h3 id="3-4-使用实例"><a href="#3-4-使用实例" class="headerlink" title="3.4 使用实例"></a><font size=3>3.4 使用实例</font></h3><p>我们用<code>git restore</code>来试一下吧：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git restore --staged test.c</span><br></pre></td></tr></table></figure>

<p>然后我们会看到如下信息：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622205233019.png" alt="image-20230622205233019" style="zoom:67%;" />

<p>可以看到test.c文件已经回到了未提交到暂存库的状态了。</p>
<h3 id="3-5-提交更新"><a href="#3-5-提交更新" class="headerlink" title="3.5 提交更新"></a><font size=3>3.5 提交更新</font></h3><p>我们将上面的更改提交到版本库中，方便后边继续使用此仓库做测试。</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br><span class="line">3</span><br></pre></td><td class="code"><pre><span class="line">git commit -m &quot;feat:取消暂存文件测试(修改readme文件)&quot;</span><br><span class="line">git add .</span><br><span class="line">git commit -m &quot;feat:取消暂存文件测试(修改test.c文件)&quot;</span><br></pre></td></tr></table></figure>

<p>可以看到当前的提交记录如下：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622211911237.png" alt="image-20230622211911237" style="zoom:67%;" />

<h1 id="三、版本回退"><a href="#三、版本回退" class="headerlink" title="三、版本回退"></a><font size=3>三、版本回退</font></h1><h2 id="1-情况说明"><a href="#1-情况说明" class="headerlink" title="1. 情况说明"></a><font size=3>1. 情况说明</font></h2><p>现在我们产生了v1、v2、v3三次提交，如下图所示，主要以test.c修改来做测试：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622212625172.png" alt="image-20230622212625172" style="zoom: 67%;" />

<p>v1、v2和v3的提交，分别对应一行内容：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622212732221.png" alt="image-20230622212732221" style="zoom:67%;" />

<p>现在，我们不想要v2和v3的提交了，我现在需要回到版本v1，这该怎么办？</p>
<h2 id="2-跳到指定版本"><a href="#2-跳到指定版本" class="headerlink" title="2. 跳到指定版本"></a><font size=3>2. 跳到指定版本</font></h2><p>Git给我们提供了一个命令，用于跳到指定的提交节点去，也可以叫版本回滚吧：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git reset --hard &lt;版本号&gt; # 回到指定版本,版本号即为每次提交的hash值</span><br></pre></td></tr></table></figure>

<h2 id="3-查看提交记录hash值"><a href="#3-查看提交记录hash值" class="headerlink" title="3. 查看提交记录hash值"></a><font size=3>3. 查看提交记录hash值</font></h2><p>要想通过上边的命令来跳转到指定的版本，我们就需要知道这个指定的版本提交记录的hash值，我们有两个命令：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br><span class="line">2</span><br></pre></td><td class="code"><pre><span class="line">git reflog               # 查看所有提交记录(包括因为回滚丢失的记录)</span><br><span class="line">git log                  # 查看所有提交记录</span><br></pre></td></tr></table></figure>

<p>其实这里查看所有提交记录的时候，也可以使用 <code>git log</code>指令来查看，那么该指令与 <code>git reflog</code> 区别在哪里呢？</p>
<ul>
<li><code>git reflog</code> 命令可以查看<strong>所有分支的所有操作</strong>记录信息，<strong>包括</strong>已经被删除的 commit 记录和 reset 的操作。</li>
<li><code>git log</code> 命令可以显示<strong>当前分支所有提交过</strong>的版本信息，<strong>不包括</strong>已经被删除的 commit 记录和 reset 的操作。(注意: 只是当前分支操作的信息)。</li>
</ul>
<p>所以，当我们回滚版本回滚错了的时候，想要恢复回滚之前的版本的话， git reflog 就为该操作的实现提供了可能，后边会提到的。</p>
<h2 id="4-使用实例"><a href="#4-使用实例" class="headerlink" title="4. 使用实例"></a><font size=3>4. 使用实例</font></h2><h3 id="4-1-查看提交记录"><a href="#4-1-查看提交记录" class="headerlink" title="4.1 查看提交记录"></a><font size=3>4.1 查看提交记录</font></h3><p>这一步主要是为了获取跳转的版本的hash值：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git mylog # 用自定义的方便看</span><br></pre></td></tr></table></figure>

<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622212625172.png" alt="image-20230622212625172" style="zoom: 67%;" />

<p>我们要想跳转到v1版本的话，它对应的hash值为<code>b065bb7</code>。</p>
<h3 id="4-2-跳转指定版本"><a href="#4-2-跳转指定版本" class="headerlink" title="4.2 跳转指定版本"></a><font size=3>4.2 跳转指定版本</font></h3><p>我们现在执行下边的命令，跳转到v1提交的时候：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git reset --hard b065bb7</span><br></pre></td></tr></table></figure>

<p>执行完毕后，我们会得到以下提示：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622213658491.png" alt="image-20230622213658491" style="zoom: 50%;" />

<p>然后我们再看一下提交记录和文件：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622213752920.png" alt="image-20230622213752920" style="zoom:67%;" />

<p>可以看到文件回到了v1版本的时候，并且提交记录也只剩下v1及以前了。</p>
<h2 id="5-git-reflog的应用"><a href="#5-git-reflog的应用" class="headerlink" title="5. git reflog的应用"></a><font size=3>5. git reflog的应用</font></h2><h3 id="5-1-情况说明"><a href="#5-1-情况说明" class="headerlink" title="5.1 情况说明"></a><font size=3>5.1 情况说明</font></h3><p>上边我们已经跳转到v1的版本了，可是这个时候，突然发现v2版本也是很重要的，我现在想到v2版本去，可是那次提交貌似被我们丢掉了哎？怎么办？这个时候<code>git reflog</code>就派上用场了。</p>
<h3 id="5-2-查看所有提交记录"><a href="#5-2-查看所有提交记录" class="headerlink" title="5.2 查看所有提交记录"></a><font size=3>5.2 查看所有提交记录</font></h3><p>我们执行下边的命令，看一下会有什么输出：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git reflog</span><br></pre></td></tr></table></figure>

<p>然后我们会得到以下输出信息：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622214138386.png" alt="image-20230622214138386" style="zoom:67%;" />

<p>这两个不就是我们的v2和v3的提交嘛，这样我就就可以获取这两次提交的hash值了，例如v2提交记录的hash为<code>68b6e33</code>。</p>
<h3 id="5-3-跳转到指定版本"><a href="#5-3-跳转到指定版本" class="headerlink" title="5.3 跳转到指定版本"></a><font size=3>5.3 跳转到指定版本</font></h3><p>我们执行以下命令跳转到v2版本的提交：</p>
<figure class="highlight shell"><table><tr><td class="gutter"><pre><span class="line">1</span><br></pre></td><td class="code"><pre><span class="line">git reset --hard 68b6e33</span><br></pre></td></tr></table></figure>

<p>然后我们看一下文件和提交记录：</p>
<img data-src="https://fanhua-picture.oss-cn-hangzhou.aliyuncs.com/02%E5%BC%80%E5%8F%91%E5%B7%A5%E5%85%B7/03%E7%89%88%E6%9C%AC%E6%8E%A7%E5%88%B6/LV01-Git-04-Git%E6%9C%AC%E5%9C%B0%E4%BB%93%E5%BA%93-04-%E6%92%A4%E9%94%80%E4%B8%8E%E7%89%88%E6%9C%AC%E5%9B%9E%E9%80%80/img/image-20230622214405045.png" alt="image-20230622214405045" style="zoom:50%;" />

<p>可以看到目前已经位于v2提交记录的版本啦。</p>

    </div>

    
    
    

    <footer class="post-footer">




    <div>
        
            <div style="text-align:center;color: #ccc;font-size:14px;">
            ----------本文结束
            <i class="fas fa-fan fa-spin" style="color: #FF1493; font-size: 1rem"></i>
            感谢您的阅读----------
            </div>
        
    </div>





  
  <div class="my_post_copyright"> 
    <p><span>文章标题:</span><a href="/post/b3401885.html">LV01-Git-04-Git本地仓库-04-撤销与版本回退</a></p>
    <p><span>文章作者:</span><a href="/" title="欢迎访问 《苏木》 的学习笔记">苏木</a></p>
    <p><span>发布时间:</span>2023年07月02日 - 15:14</p>
    <p><span>最后更新:</span>2025年06月14日 - 00:25</p>
    <p><span>原始链接:</span><a href="/post/b3401885.html" title="LV01-Git-04-Git本地仓库-04-撤销与版本回退">https://sumumm.github.io/post/b3401885.html</a></p>
    <p><span>许可协议:</span><i class="fab fa-creative-commons"></i> <a rel="license" href= "https://creativecommons.org/licenses/by-nc-nd/4.0/" target="_blank" title="Attribution-NonCommercial-NoDerivatives 4.0 International (CC BY-NC-ND 4.0)">署名-非商业性使用-禁止演绎 4.0 国际</a> 转载请保留原文链接及作者。</p>  
  </div>
  


          <div class="post-tags">
              <a href="/tags/Git/" rel="tag"><i class="fa fa-tag"></i> Git</a>
          </div>

        

          <div class="post-nav">
            <div class="post-nav-item">
                <a href="/post/fc417449.html" rel="prev" title="LV01-Git-04-Git本地仓库-05-Git分支简介">
                  <i class="fa fa-angle-left"></i> LV01-Git-04-Git本地仓库-05-Git分支简介
                </a>
            </div>
            <div class="post-nav-item">
                <a href="/post/f7668e71.html" rel="next" title="LV01-Git-04-Git本地仓库-03-提交历史">
                  LV01-Git-04-Git本地仓库-03-提交历史 <i class="fa fa-angle-right"></i>
                </a>
            </div>
          </div>
    </footer>
  </article>
</div>






</div>
  </main>

  <footer class="footer">
    <div class="footer-inner">

  <div class="copyright">
    &copy; 2017 – 
    <span itemprop="copyrightYear">2025</span>
    <span class="with-love">
      <i class="fa fa-heart"></i>
    </span>
    <span class="author" itemprop="copyrightHolder">苏木</span>
  </div>
<div class="wordcount">
  <span class="post-meta-item">
    <span class="post-meta-item-icon">
      <i class="fa fa-chart-line"></i>
    </span>
      <span>站点总字数：</span>
    <span title="站点总字数">3.7m</span>
  </span>
  <span class="post-meta-item">
    <span class="post-meta-item-icon">
      <i class="fa fa-coffee"></i>
    </span>
      <span>站点阅读时长 &asymp;</span>
    <span title="站点阅读时长">225:26</span>
  </span>
</div>




    <span id="sitetime"></span>
    <script defer language=javascript>
        function siteTime()
        {
            window.setTimeout("siteTime()", 1000);
            var seconds = 1000;
            var minutes = seconds * 60;
            var hours = minutes * 60;
            var days = hours * 24;
            var years = days * 365;
            var today = new Date();
            var todayYear = today.getFullYear();
            var todayMonth = today.getMonth()+1;
            var todayDate = today.getDate();
            var todayHour = today.getHours();
            var todayMinute = today.getMinutes();
            var todaySecond = today.getSeconds();
            /*==================================================
            Date.UTC() -- 返回date对象距世界标准时间(UTC)1970年1月1日午夜之间的毫秒数(时间戳)
            year        - 作为date对象的年份，为4位年份值
            month       - 0-11之间的整数，做为date对象的月份
            day         - 1-31之间的整数，做为date对象的天数
            hours       - 0(午夜24点)-23之间的整数，做为date对象的小时数
            minutes     - 0-59之间的整数，做为date对象的分钟数
            seconds     - 0-59之间的整数，做为date对象的秒数
            microseconds - 0-999之间的整数，做为date对象的毫秒数
            ==================================================*/
            var t1 = Date.UTC(2017, 
                              5, 
                              19, 
                              0, 
                              0, 
                              0); //北京时间
            var t2 = Date.UTC(todayYear,todayMonth,todayDate,todayHour,todayMinute,todaySecond);
            var diff = t2-t1;
            var diffYears = Math.floor(diff/years);
            var diffDays = Math.floor((diff/days)-diffYears*365);
            var diffHours = Math.floor((diff-(diffYears*365+diffDays)*days)/hours);
            var diffMinutes = Math.floor((diff-(diffYears*365+diffDays)*days-diffHours*hours)/minutes);
            var diffSeconds = Math.floor((diff-(diffYears*365+diffDays)*days-diffHours*hours-diffMinutes*minutes)/seconds);
            document.getElementById("sitetime").innerHTML="已在这里 "+diffYears+" 年 "+diffDays+" 天 "+diffHours+" 小时 "+diffMinutes+" 分钟 "+diffSeconds+" 秒";
        }
        siteTime();
    </script>



    </div>
  </footer>

  
  <div class="back-to-top" role="button" aria-label="返回顶部">
    <i class="fa fa-arrow-up fa-lg"></i>
    <span>0%</span>
  </div>
  <div class="reading-progress-bar"></div>

<noscript>
  <div class="noscript-warning">Theme NexT works best with JavaScript enabled</div>
</noscript>


  
  <script src="https://cdnjs.cloudflare.com/ajax/libs/animejs/3.2.1/anime.min.js" integrity="sha256-XL2inqUJaslATFnHdJOi9GfQ60on8Wx1C2H8DYiN1xY=" crossorigin="anonymous"></script>
  <script src="https://cdnjs.cloudflare.com/ajax/libs/next-theme-pjax/0.6.0/pjax.min.js" integrity="sha256-vxLn1tSKWD4dqbMRyv940UYw4sXgMtYcK6reefzZrao=" crossorigin="anonymous"></script>
  <script src="https://cdnjs.cloudflare.com/ajax/libs/fancyapps-ui/5.0.28/fancybox/fancybox.umd.js" integrity="sha256-ytMJGN3toR+a84u7g7NuHm91VIR06Q41kMWDr2pq7Zo=" crossorigin="anonymous"></script>
  <script src="https://cdnjs.cloudflare.com/ajax/libs/lozad.js/1.16.0/lozad.min.js" integrity="sha256-mOFREFhqmHeQbXpK2lp4nA3qooVgACfh88fpJftLBbc=" crossorigin="anonymous"></script>
<script src="/js/comments.js"></script><script src="/js/utils.js"></script><script src="/js/motion.js"></script><script src="/js/next-boot.js"></script><script src="/js/pjax.js"></script>

  <script src="https://cdnjs.cloudflare.com/ajax/libs/hexo-generator-searchdb/1.4.1/search.js" integrity="sha256-1kfA5uHPf65M5cphT2dvymhkuyHPQp5A53EGZOnOLmc=" crossorigin="anonymous"></script>
<script src="/js/third-party/search/local-search.js"></script>




  <script src="/js/third-party/fancybox.js"></script>

  <script src="/js/third-party/pace.js"></script>


  




  

  <script class="next-config" data-name="enableMath" type="application/json">false</script><script class="next-config" data-name="mathjax" type="application/json">{"enable":true,"tags":"none","js":{"url":"https://cdnjs.cloudflare.com/ajax/libs/mathjax/3.2.2/es5/tex-mml-chtml.js","integrity":"sha256-MASABpB4tYktI2Oitl4t+78w/lyA+D7b/s9GEP0JOGI="}}</script>
<script src="/js/third-party/math/mathjax.js"></script>


 
        <div id="click-show-text"
            data-mobile = false
            data-text = 富强,民主,文明,和谐,自由,平等,公正,法制,爱国,敬业,诚信,友善
            data-fontsize = 15px
            data-random= false>
        </div>
       

      
        <script async src=https://cdn.jsdelivr.net/npm/hexo-next-mouse-effect@latest/click/showText.js></script>
      

      
    




    <script async src="/js/fancybox_param.js"></script>





<!-- APlayer本体 -->



</body>
</html>
